x11: Make wrapper member a GdkDrawable

This is in preparation for getting rid of GdkDrawable as a dependency of
GdkWindow.

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 1435fdf94b505b324da5052798c24036f38cc685..2589fa6c54099446952f5b2123ac4891fcaec77b 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -514,7 +514,7 @@ _gdk_windowing_window_init (GdkScreen * screen)
   impl = GDK_WINDOW_IMPL_X11 (private->impl);
   
   impl->xid = screen_x11->xroot_window;
-  impl->wrapper = GDK_DRAWABLE (private);
+  impl->wrapper = GDK_WINDOW (private);
   
   private->window_type = GDK_WINDOW_ROOT;
   private->depth = DefaultDepthOfScreen (screen_x11->xscreen);
@@ -754,7 +754,7 @@ _gdk_window_impl_new (GdkWindow     *window,
   
   impl = g_object_new (_gdk_window_impl_get_type (), NULL);
   private->impl = (GdkDrawable *)impl;
-  impl->wrapper = GDK_DRAWABLE (window);
+  impl->wrapper = GDK_WINDOW (window);
   
   xdisplay = screen_x11->xdisplay;
 
@@ -964,7 +964,7 @@ gdk_window_foreign_new_for_display (GdkDisplay     *display,
                                                   XVisualIDFromVisual (attrs.visual));
 
   impl = GDK_WINDOW_IMPL_X11 (private->impl);
-  impl->wrapper = GDK_DRAWABLE (window);
+  impl->wrapper = window;
   
   private->parent = gdk_xid_table_lookup_for_display (display, parent);
   

diff --git a/gdk/x11/gdkwindow-x11.h b/gdk/x11/gdkwindow-x11.h
index 570a9572a3321dd107ae4275f485dd88f75d3287..04dc8aa0aad69fe5520ff6a807028481206c32ea 100644 (file)
--- a/gdk/x11/gdkwindow-x11.h
+++ b/gdk/x11/gdkwindow-x11.h
@@ -58,7 +58,7 @@ struct _GdkWindowImplX11
 {
   GdkDrawable parent_instance;
 
-  GdkDrawable *wrapper;
+  GdkWindow *wrapper;
 
   Window xid;